[OT] FIX for #289 and #186
Step numbering updated
Merge pull request #307 from alanjds/fix-289-and-186

Fixes for #289 and #186