fixed issue with cookies
Merge branch 'master' of git://github.com/zucchi/Zucchi