update

update
Merge pull request #14 from xiejunfeng/master

update