rewrite 1
rewrite 2
Version which went to Thomas and Alan
Merge branch 'master' of github.com:roblevy/levy-oleronevans-2014