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