Clean up

Clean up
Merge branch 'master' into gh-pages