Duplicate portion of the code removed.
Merge pull request #1 from bfontaine/duplicate-code

Duplicate portion of the code removed.