Use diamond operator for java 7
Use diamond operator for java 7
Merge pull request #325 from LeovR/diamond

Use diamond operator for Java 7