Added baseUrl option, and fixed "urls" option handling