Revert "Merge pull request #59 from ottemo/develop"
Merge pull request #62 from ottemo/revert-61-master

Revert "Merge pull request #59 from ottemo/develop"