Jar update, javadoc update
Merge pull request #208 from HoltMaki/master

Jar update, javadoc update