Fixed last commit
Merge pull request #27 from HackSocNotts/dev

Fixed last commit