Added javadoc, did debugging
Merge commit