Merge branch 'master' into gh-pages
remove old files
Merge branch 'gh-pages'