#173 solution and added unit test with added test checks
Fix JDK 6 compilation
#180 fix
#102 sharing mapper configuration and unit test
#102 fixing javadoc