fixups
Merge branch 'master' of https://github.com/andrewhao/mailbox