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