Issue #3
Merge branch 'release-1.0'