Step number tracking - fixes #38