Merge pull request #120 from RAlmada/master

javadocs