Completed fix issue #44; repair tests for JDK==1.6
Merge pull request #45 from Apkawa/working

Completed fix issue #44; repair tests for JDK==1.6