Merge pull request #8 from dstimac/master

Reworked Cookie menagment:
Merge remote-tracking branch 'tomo/master'