Added cookieHandler support
Merge branch 'add_cookie'