Closes #134
Merge branch 'bugfix-#134' into hotfix-3