Replacing type declarations of variables/params by more generic types (as usually advised).
fix compilation failure by previous commit.
Merge pull request #5 from eribeiro/master

Refactoring the types of variables and params to more generic types