Fixes issue #70, adds support for domains
Merge pull request #71 from mde/master

Fixes issue #70, adds support for domains