taking into account other potential values for constructor
Merge pull request #1 from mtaher/ssl

Taking into account other potential values for constructor