Fixed crash if an event was called wich does not exists
Some more natives stuff
Cleaned up some code
Merge remote-tracking branch 'upstream/master'