Merge pull request #7 from apanda/master

More detailed event trace