Update Dev 0.0.9

Added event handler