Merge branch 'release/1.0.14'
Merge pull request #34 from praekelt/master

Merge branch 'release/1.0.14'