Merge pull request #2 from luohuazju/develop

Develop
Merge pull request #3 from luohuazju/develop

Develop
Merge pull request #4 from luohuazju/develop

Develop
Merge branch 'master' of https://github.com/luohuazju/magic into token_hash