Merge pull request #40 from Amarcolina/master

Updated grass to deal with events properly