Updating readme
merge master