Merge pull request #24 from praekelt/develop

Merge develop->master
Merge pull request #25 from praekelt/master

Merge pull request #24 from praekelt/develop