Implemented new expanded https setting, fixes #6