Merge pull request #627 from heatherleaf/iter

Parser bugfixes