Merge pull request #18 from tjahnk/basic_events