added some javadoc
Merge pull request #623 from davvitt/javadoc_1

added some javadoc