fixed bug in Kevin's buggy-arsed code
Merge branch 'master' of https://github.com/Bradshaw/octo-hipster