Merge pull request #82 from jpnurmi/legacypeer