make code Java 7 compatible
Merge pull request #6 from slintes/java7

Make code Java 7 compatible