richfitz Merge pull request #21 from mrc-ide/mrc-1800