change to eventmaster
Merge remote-tracking branch 'upstream/master'
Merge pull request #45 from Rakeshadlagatta/master

eventmaster change