Adds generic type information where possible
Merge pull request #16 from JoanZapata/remove-raw-types

Adds generic type information where possible