updated Javadoc comments
Merge pull request #32 from BernieC/master

updated Javadoc comments