Fix merged and on npm now