npm updates
Merge pull request #156 from Trott/updates

npm updates