#89 start working on java8 only