fixed associations
Merge pull request #13 from cherimarie/associations

fixed associations