Made iteration always update properly
Merge branch 'master' into gh-pages