Merge pull request #6 from amalraj-nodejs/master

master to develop
Merge pull request #7 from amalraj-nodejs/develop

Merge pull request #6 from amalraj-nodejs/master