Merge branch 'release/1.0.18'
Merge pull request #42 from praekelt/master

Merge branch 'release/1.0.18'