testing
Merge branch 'master' of git://github.com/PeterofOrange/SimpleMail
Merge branch 'master' of git://github.com/PeterofOrange/SimpleMail
These might work soon
hopefully working