added config event functionality
Merge branch 'feature/config'