Merge branch 'issue-39'
Fix for #57.
Merge branch 'issue-57' into develop