new java 8 version
Small refactoring
switch version of java 7 to 65
merged