Upgraded version for npmjs.org