Converting to Java 8
Merge fix