Merge pull request #1 from FMJansen/master

Merge from FMJansen
Hopefully fixed cookie problem #6
Merge pull request #9 from mpvharmelen/master

Hopefully fixed cookie problem, working towards #6