Markups from initial code review
Merge pull request #42 from Metaswitch/alex_markups

[No review required] Markups from initial code review