Fix cli bugs
Merge branch 'master' of https://github.com/Flolagale/mailin