Fix/npm

Replaces #355