Merge pull request #31 from afontaine/javadoc

Code Documentation