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