various changes for version 1.0
Merge remote-tracking branch 'origin/master'