Further changes
Merge pull request #26 from Callum-/master

Further changes