Merge branch 'release/1.0.15'
Merge pull request #37 from praekelt/master

Merge branch 'release/1.0.15'