fixed derp and update javadoc
Merge pull request #320 from hilburn/1.7-update

fixed derp and update javadoc