Merge pull request #77 from ddobrev/master

Properties
Added the event to its block to maintain the connection between them.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>