child
fix events
Merge pull request #7 from fgassert/master

sync with master