Add Java 1.6 compatibility

Refs #113 @ 2h