Merge pull request #7 from oheric/eric

changed associations
changed assoc