Should fix issue #27. Adding support for domain aliases