Feature/enhance ssh remote