Making 1st failing test pass.
Merge branch 'master' of https://github.com/Meowse/TheBatCave