gxlarson Merge pull request #6 from epeters3/domain-mapping