update

update
Merge pull request #7 from xiejunfeng/master

update