Removing System.out.
Merge remote-tracking branch 'upstream/master'