Merge branch 'master' into gh-pages
Stuffz
Merge branch 'gh-pages'