TimeStep and MaxIteration goes to Options
Merge remote-tracking branch 'origin/master'