Merge pull request #8 from aandis/master

Enhancement #6 added
event updates
Removed files
Fixed a little bug