Merge pull request #72 from RAlmada/master

updating javadocs