add Step functionality. Fiexes #8