Updates

Remove java 1.7 features used and make compatible with java 1.6