Changed name of axis condition to travel.
Merge branch 'step-1' into step-5