Update for  Adding support for JDK8 compiler #4