Fixed javadoc and copyright