stylin'
Merge branch 'master' into gh-pages
such doge
Merge branch 'master' into gh-pages