Add ability to set a custom domain
Merge fix for customDomain
Merge branch 'develop'