fixes #93
Merge branch 'hotfix/issue-#93'