updated Event and parser
updated parser and event
Merge branch 'master' of https://github.com/haamoon/FFF