for Timon and the greater good
Merge branch 'master' of https://github.com/secult/hgroup