Callens crappy code
Merge branch 'master' of https://github.com/cal5barton/cbjfmw