generic fix WIP (commit: 30e2dac)
fixed compile-error after rebase (commit: a28e39a)
worked on fixing generics (#490) (commit: 33bf656)
more dirty hacks to improve generics (commit: d54a616)