Merge branch 'master' into gh-pages
cleaning up, minimizing code
Merge branch 'gh-pages'