Added block argument to step method and fixed expand