Fix Issue #374: Version 1.5.0 fails on JDK 8
Merge pull request #383 from sanelson2000/master

Fix Issue #374: Version 1.5.0 fails on JDK 8