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