Merge pull request #11 from square/holmes/fix-for-13_1

Fix for 13.1
Actually, build for Java 6