merged with npm version