Merge pull request #19 from echen027/master

gets less events, and add text/html to the event