style is a bit loud
Merge branch 'master' into gh-pages