Add support for :step option - resolves TODO :)

Added support, with tests, for a :step option. :)