Merge pull request #1 from wangzhaojiang/master

^_^
Merge pull request #2 from dazzle111/master

Merge pull request #1 from wangzhaojiang/master