Add event support
Fix parameter order, add tests
Test all branches in travis
Merge branch 'master' into events
Merge master into events branch and fix accordingly
Merge branch 'master' into events
Bump to v0.4.0