fix cookie jar refactor/refactor

This fixes #46.
Preparing release 2.15
Back to development: 2.16