Merged iterX-refactor from repository JuantAldea
TODO removed