Initial work
Fix bad domains
Merge pull request #1 from clickhappen/develop

Initial work