Restore computeEntryCookie() functionality
Merge pull request #426 from tamihiro/master

Restore computeEntryCookie() functionality