Update readme
Merge branch 'master' into dev_j