#29 JDK7 -> JDK8
Merge pull request #44 from emag/enhancement29

#29 JDK7 -> JDK8