update

update
Merge pull request #17 from xiejunfeng/master

update