Java 1.6 support
Merge pull request #7 from Gotusso/master

Java 1.6 support