Add cookie management
Added exception logging
Merge with master branch
Fixed sorting after merge