Potential fix for #20, needs testing
Merge branch 'develop' into issue-20
Merge branch 'issue-20' into develop

Closes #20