Added feature Events
Merge branch 'feature-event'