Rolled compatibility down to JDK6
Merge pull request #85 from ysb33r/master

FIXES #64 - Rolled compatibility down to JDK6