Updating readme
Merges master into develop