Merge branch 'issue-30' into develop

Closes #33
Closes #30