sort of kind of fixed the word-splitting issue
Merge branch 'master' of github.com:corcra/bots