Add switching for motion events
Merge branch 'master' of ../stage