Merge pull request #62 from akkie/master

Remove old event implementation in favor of #59
Fix: Adapting argument list by creating a 2-tuple warning