Ensure JDK5 compatibility. Fixes #392.
Merge pull request #403 from ahus1/ahus1_jdk_compatibility

Ensure JDK5 compatibility. Fixes #392.