version 1.0
Revert "version 1.0"

This reverts commit ac7eb264b34d2637b875bfd88657957cf591a590.
Revert "Revert "version 1.0""

This reverts commit b6767880cda4af1e7ec5bd62f4cd1e53e1f84291.
Merge branch 'master' of https://github.com/samhao/master