Fix for multiple address
Merge pull request #154 from ministryofjustice/feature/fix-multiple-addresses

Fix for multiple address