Updated javadoc to remove some warnings
Merge pull request #15 from tomw2/docup

Updated javadoc to remove some warnings []