Added secure connection
Merge