Fix Ctrl-C issue. Support more email cases
Refactor. Prepare for PyPi