Added BASE_URL
Merge