#85: Updating code
Merge pull request #86 from dotCMS/issue-85-default-host

#85: Updating code