Added Event methods & fixed duplicate method names
Merge branch 'master' of https://github.com/MMP-HCKMCR/MMP