Initial commit of merged version