Merge pull request #26 from Joerg-Schoemer/master

gradle build, index improvements
Generics