Merge pull request #2 from y-higuchi/iter_fix

Fix iterator use