Jar update with more work put into it.
Merge pull request #305 from HoltMaki/master

Jar update with more work put into it.