Merge pull request #225 from wb14123/dup