Merge pull request #15 from mperrando/feature/fix-empty-domain-error