Improve parts of iterators
Merge remote-tracking branch 'origin/master'