Reworked events and added key. #38 #39
Merge pull request #40 from openpowerquality/38

Reworked events and added key. #38 #39