Merge pull request #42 from arturobernalg/feature/javadoc

Complete javadoc