added generics to remove warnings
Merge branch 'master' of https://github.com/fatschi/art