Merge branch 'master' of github.com:glg/eventifier