Updating readme
merge master
Merged develop