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

FIXED #84 - Rolled compatibility down to JDK6