Merge pull request #3 from chr7/master

Fix: wrong event check causes error
Merge branch 'dev'
Readme update
Merge branch 'dev'