Add support for SSL
Merge branch 'ssl-support'