Merge pull request #12 from nodejoy/master

update
Merge pull request #5 from xudafeng/master

Merge pull request #12 from nodejoy/master