Included support of the HTTPS protocol
Merge with remote changes