Dependencies fixed
Event handling added
Event demo added
Merge origin/master