Feature/graviton event

For me it's ok to fix it directly in develop. 
Btw thanks for your feedback / help!!