fixed broken gh-pages link
Merge branch 'master' into gh-pages
added more docs