Updated code per Alex's suggestions.
Merge branch 'master' of https://github.com/krisc/events
pulling edits made to tutorial