Merge pull request #854 from renatocn/reboot

More event tracking