Update javadoc for 2.0

fixes #140
Merge pull request #159 from dankurka/javadoc

Update javadoc for 2.0