#49 - java8 support
improved