Removed calls that required Java 7
Merge pull request #64 from mwanji/restore_java_6_compat

Removed calls that required Java 7