Merge pull request #90 from fdelapena/master

Move javadoc comments to .h where possible