Hotfix/issue37

This is a fix to the issue I created: issue 37.