Add config option for different bot types
Merge remote-tracking branch 'origin/master'