zh
Merge pull request #13 from wlgys8/master

update from wlgys8