Cleaning up the code base a bit
Merge branch 'master' into gh-pages