Readme and code changes. v2