Merge pull request #12 from nodejoy/master

update