Fix string replacement issues
Add botName to event and some cleanup.
Merge pull request #3 from cnaude/master

Add event support