Simple Event Added

Merge Develop to Master (Simple Event)