fixed associations
Merge pull request #35 from nullet/something

fixed associations