zh
Merge pull request #17 from wlgys8/master

update from wlgys8