a little refactoring and variables initialization (issue #21 will be happy).
Merge branch 'master' of github.com:mailwatch/1.2.0