Merge branch 'master' into gh-pages
Final touches

Final touches