Merge branch 'master' into develop
Improving appearance of email output
Typo in test config
Adding event dispatching capability
Typo in event dispatching
Merge branch 'develop'