Fixed bug #2
Merge remote-tracking branch 'origin/release-1.0'