Merge pull request #11 from aleasoluciones/master

By default use the ssh configured port for this host (not always 22)
Merge remote-tracking branch 'upstream/master'