Fix java8
Merge pull request #47 from jad7/upJavaV8

One more Fix java8