Updated for npm publish