Merge pull request #193 from xschlef/links-params-fix