hotfix
Merge pull request #48 from varholl/development

hotfix