Issue #615 fixed

The code has been tested and it compiles fine using Java 8.