Closes #117
Merge branch 'bugfix-#117' into hotfix-1