Use Generics

[lhemala]

Hi,

I wondered if you are going to update the code to use generics.
Someone already forked the repository and did that, apply that commit here as well.
See RyuaNerin@ec37996

Thanks