Add support for :step option - resolves TODO :)