Added support for global events
Merge branch 'development'