Merge pull request #220 from jwillemsen/jwi-cleanuplinker