add cookie config methods
Merge remote-tracking branch 'kstep/master'