fixed cookie handling
Merge branch 'hotfix/0.2.2'
Merge tag 'v0.2.2' into develop

hotfix 0.2.2