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