Merge branch 'release/1.0.17'
Merge pull request #41 from praekelt/master

Merge branch 'release/1.0.17'