Updated URLs
Merge branch 'master' into gh-pages
Port update
Merge branch 'gh-pages'