Merge pull request #22 from jmacglashan/jmacglashan

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

Jmacglashan
Merge branch 'master' into jmacglashan