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