Merge branch 'release/1.0.12'
Merge pull request #29 from praekelt/master

Merge branch 'release/1.0.12'