Added some more stuff
Merge pull request #1 from jamespayne/testbranch

Yeah no worries