Merge pull request #235 from alelenv/rt_motion