Closes #50.
Merge branch 'issue-50' into develop