Working on javadoc and fixed #8