Some minor changes
Merge pull request #1 from edalorzo/javadocs

Some minor changes