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