Java 1.6 Compliant
Merge pull request #103 from buren/Java6_fix

Java 1.6 Compliant