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