update

update
Merge pull request #18 from wuzhitian/master

update