updated
Merge pull request #12 from lujiacn/master

update