Cleanup of domains and better isDone error handling
Merge pull request #27 from wpreul/master

Cleanup of domain listeners and better isDone error handling