add cookie
edit readme
Merge develop