Closes #130
Merge branch 'bugfix-#130' into hotfix-2