Merge pull request #598 from pcercuei/lightrec_events