Quick and dirty add of Java 8 fixes
Merge branch 'pr/27'