Closes #28
Merge branch 'bug-#28' into develop