Closes #49 (Finally)
Merge branch 'bugfix-#49' into develop