FIX: Fix initialize events
FIX: Fix event order
STY: Better comment
Merge pull request #332 from Eric89GXL/fix-init

FIX: Fix initialize events