Fixing too bad merge
Updating readme to new version