Various javadoc fixes
Merge pull request #22 from jmacglashan/jmacglashan

Various javadoc fixes