Fix Default Tenants
Merge pull request #139 from cortiz/master

Fix Default Tenants