Merging my master branch into the main repo

I'll let you reject or accept this request because I'm not sure if it'll mess up your function refactoring into Bot.cs. EDIT: this is a pull request, not a push one so it shouldn't be destructive.