Michael's changes
Merge branch 'master' of https://github.com/mcdeguzman99/SpamBot
more changes.