Fixed replay mode
Merge branch 'controllerTest' of https://github.com/ktn/Iter2 into controllerTest