Merge pull request #4 from dlazell/addtobot

Addtobot
Merge remote-tracking branch 'upstream/master' into addtobot