Closes #48
Merge branch 'bugfix-#48' into develop