Merge pull request #3 from jasonctest/develop

push new one 12-20
Merge branch 'master' of https://github.com/jasonctest/test into develop2