hotfix
Merge pull request #231 from mayabrandi/develop

hotfix