Some initial changes to update and bring inline
Merge branch 'master' of github.com:qubit05/maxemail-env