Use Java 6 compatibility (align with project settings)
Add generic types wherever it is possible
Merge pull request #27 from tomason/generics

Generics