:gb: Fixed motion calculation.
Merge branch 'master' into gh-pages