Closes #96
Merge branch 'issue-96' into develop