Merge pull request #1 from alvico/merge_branch

Merge branch from Albert including SSH gateway
merge
changed the if condition in order to trigger the cmd timeout, so now it goes at the same lvl that the channel ready status