Link associations
Merge pull request #102 from RWOverdijk/hotfix/link-associations

Link associations