added additional javadoc comments
Merge pull request #118 from RAlmada/master

added additional javadoc comments