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