updated with log4j
Merge branch 'master' into chapter7
Merge branch 'chapter7'