Fix #16 (on the right branch this time!)
Merge branch 'master' of github.com:ian-kent/Go-MailHog