Merge pull request #1 from BrownSensei/master

Updated on PC
Now changed on laptop
Merge pull request #1 from AndrewBrownSQS/master

Pull the stuff back to the PC