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