Fixed the baseUrl issue
Merge branch 'origin/master'