Commit ALL OF THE CODE
Merge branch 'master' into gh-pages