Modified javadoc
Merge pull request #4 from diegorugg/master

Modified javadoc