Merge pull request #6 from PressAssociation/james

Merge of James' branch
Merge pull request #8 from PressAssociation/james

James' fixes
Merge pull request #10 from PressAssociation/master

Merge of James' branch