Merge pull request #2 from wangzhaojiang/master

update
Merge pull request #15 from dazzle111/master

Merge pull request #2 from wangzhaojiang/master