rory's stuff
Merge pull request #4 from foundersandcoders/rory-and-jonny

rory's stuff