Better fix?
Merge pull request #29 from HackSocNotts/dev

Better fix?