Attempt at #112
Merge branch 'develop' into issue-112
Merge branch 'issue-112' into develop

Closes #112