Merge branch 'gh-pages'
update with links
Merge branch 'master' into gh-pages