Change base URL(2)
Merge branch 'hotfix-base_url' into gh-pages