updated index
Merge branch 'master' into gh-pages
GA
Merge branch 'master' into gh-pages