log4j config - did not tested yet
Merge remote-tracking branch 'origin/master'