Added functions. Renamed wrong named functions e.g. *_event to *_f
Merge pull request #12 from rikkimax/Patches

Added functions. Renamed wrong named functions e.g. *_event to *_f