Added support for Generic Relations.
Bug correction
Merge pull request #4 from rchicoria/develop

Added support to generic relations