Fixing issue #100. Will be in v1.0.0-rc2.
Merge branch 'release-1.0' into develop