Created a first working example with event
Merge branch 'develop'