Resolve #16 - Iterator