Merge pull request #3 from IanLee1521/master

Minor improvements to iteration