Added support for domains without www.
Merge remote-tracking branch 'origin/master'