Javadcs + Store Update
fix merge