Fixing issue #90
Merge branch 'release-1.0' into develop