fixed stuff
Merge pull request #17 from Callum-/master

fixed stuff