Merge branch 'master' into gh-pages
bump
Added GA
Merge branch 'gh-pages'