Merge pull request #87 from RAlmada/master

updated javadocs