Switch domain from beginning to after the user name.
Merging changes to the master branch.