Merge pull request #1 from loye/master

modify package.json
Merge pull request #2 from loye/dev

Merge pull request #1 from loye/master