Issue #105
Merge branch 'issue105' into release-1.0