replace systtem.out with logger
merge master and test, replace syso to log