Updates after review
Merge pull request #16 from Metaswitch/host

[No need for review] Updates after review