Jdoc and formatting improvements
Merge pull request #37 from jtorrente/jdocformatting

Jdoc and formatting improvements
Merge remote-tracking branch 'upstream/master' into featured