Make use of the Java 7 diamond operator.
Merge pull request #14 from ChristianBecker/java7diamond

Make use of the Java 7 diamond operator.