bug found from iterate
a bug fixed in iterate
conflict fixed
Merge pull request #22 from WheBurr/test-iterate

Iterate fixed