Fixed association issues
Merge pull request #9 from raulfraile/master

Fixed association issues