workaround some nutty race condition
1.4.1
Fixes issue #70, adds support for domains
Merge pull request #71 from mde/master

Fixes issue #70, adds support for domains
1.4.2
merge master