Changed cookie setting code to not to overwrite previous cookies.
Merge remote-tracking branch 'origin/master'