Changed generics that were useless and causes compiler errors on Java
1.6
Merge pull request #17 from AludraTest/fixes

Improved generics that were useless and caused compiler errors on Java 1.6