(demo.SampleMotionCaller) Trying to fix but not yet #11. Re-commiting some changes that were somehow reverted