update Cookie.set method
Merge branch 'development'