refactor
Merge pull request #11 from ryysd/change_association

refactor