Merge pull request #24 from kshsieh/master

further fix association bug