add https support
Merge branch 'master' into aja/https