Merge pull request #77 from ns-uw/master

minor tune-up of events stuff