Added javadoc
fix commit problem