add java 7 support
Merge remote-tracking branch 'allnightlong/java7'