prepare for event handling
Merge branch 'master' of https://github.com/klakplok/goji