Updated for new NPM style