removing debug infos (std::cout's)
Merge remote-tracking branch 'upstream/master'