Updated readme
Merge branch 'master' into dev
updated readme (again)