0.8.4 - fixed events
merge 0.8.4