Events rework
Rework events #7. Version update.
merge