Merge branch 'release/1.0.16'
Merge pull request #39 from praekelt/master

Merge branch 'release/1.0.16'