Merge pull request #1 from microcai/master

changelog
cookie