Merge pull request #100 from guardian/jw-logging-changes

Merge pull request #100 from guardian/jw-logging-changes #192