Fixed #595
fixed #558
Merge pull request #600 from ostcar/motion

Fixed motion bugs