update

update
Merge pull request #12 from xiejunfeng/master

update