adapted for Java 8
Merge branch 'master' of github.com:ksulrich/java