Merge pull request #110 from Randgalt/master

1.1.15