Stuff
Merge branch 'master' of https://github.com/ruddernz/Beef
Bug checking in progress