Merge branch 'master' into gh-pages
Final Commit
Merge branch 'gh-pages'