Merge branch 'hotfix/issue42' into develop
Merge pull request #43 from UsainBloot/develop

Merge branch 'hotfix/issue42' into develop