Merge pull request #1 from jackhuang007/master

Master
Merge pull request #2 from jackhuang007/release1.0

Merge pull request #1 from jackhuang007/master