build
merge upstream
fix directive deps
fix sample
Merge pull request #23 from Geode/fixEvents

Fix olevents directive