Merge pull request #357 from bhariharan/master

Bug fixes for 2.0.1
Bump up npm version