Ensure support for java 1.6

Closes issue #12