Merge pull request #24 from praekelt/develop

Merge develop->master