Closes #123
Merge branch 'bugfix-#123' into hotfix-1