Merge pull request #129 from Randgalt/master

version 1.1.16