update
Merge pull request #18 from lanxiang/master

update