Added support for custom ssl port
Merge branch 'dev' into custom_port
Added support for custom SSL port