Update readme
Update @nashira's Link
Merge branch 'master' into gh-pages