Merge pull request #154 from ministryofjustice/v1.1Refactor

V1.1 refactor
Merge branch 'master' into v1.1Refactor