Closes #142
Merge branch 'bugfix-#142' into hotfix-4