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