Fixed event limit
Merge branch 'master' into production