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