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