Fix singleton for domain store
Merge pull request #556 from cookiekiller/master

Fix singleton for domain store