Refactor java 8 [ for -> Stream ]
Merge remote-tracking branch 'origin/master'