Updated bin/dist and package.json from upstream