Merge pull request #14 from hazendaz/master

Java 6, Junit 4.10, and various other minor updates