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