Bump up npm version
Merge pull request #359 from bhariharan/master

Bump up npm version
Merge branch 'master' into unstable
Merge pull request #360 from bhariharan/unstable

Merge branch 'master' into unstable