Added Mapping
Added javadoc to Mapping.java + fixed a minor bug