Bug hunting
Merge branch 'controllerTest' of http://github.com/ktn/Iter2 into controllerTest
Fixed merge