Correct Diferents issues and complete JavaDoc
Merge origin/master