Merge pull request #33 from hakre/master

Update to 1.1.16