Add acceleration and velocity vectors
Merge with master