Extend, fix, document event management (Fixes #56)
Merge branch 'master' into cffi