Revert "version 1.0"

This reverts commit 1035a6c6fc477784a18f39b8352d01aeb6721d24.
Revert "Revert "version 1.0""

This reverts commit 18838c50e027b31f55d9784a14d58e812e881ad6.
Merge remote-tracking branch 'origin/master'