Fixing your dumb broken shit 

Adding in changes from the old hoggy CBB branch that was loads better
Merge pull request #7 from Fattierob/patch-4

Fixing your dumb broken shit