CLEAN ALL THE THINGS!!!!!!!!!!!!!!
Changed logger to System.out
merge upstream.