1.0 - Added log4j jar
Merge branch 'master' into 1.0