Merge pull request #1521 from coreykosak/factor-out-common-code