Tweaks
Merge branch 'master' of github.com:kaihendry/imap2json
Merge branch 'master' of github.com:kaihendry/imap2json