Fixed links in README
Fixed view source
Merge branch 'master' into gh-pages