make the TLS setup optional
Merge pull request #492 from SvenDowideit/make-tls-optional

make the TLS setup optional