Merge pull request #21 from ztnark/events

events coming along