Fix iterator bug
Merge pull request #18 from erwinwinder/master

Fix iterator bug