General JavaDoc formatting fixes
Merge pull request #1 from aerouk/master

General JavaDoc formatting fixes from Aero.