Merge pull request #8 from ro6/master

Fix for jdk 1.8.0 b95