velocity check
Merge remote-tracking branch 'origin/conservation-of-momentum'