Merge pull request #120 from git-harry/master

Merged automatically by jenkins after successful build test
Use secure cookies when using https.