Corrected Bugs in Mapping package
test for Mapping package
Changed to Java 1.7