reorganize iterate(), great speedup
Merge branch 'master' into mac