fixes #93
Merge branch 'hotfix/issue-#93'
Merge branch 'master' into develop