Java8

This replaces #125