Java 8 iterator
Merge remote-tracking branch 'origin/master'