Issue #250 Do not use JDK7 features