User-Agent support

User-Agent support