Merge PR#43: nicer handling for ssh keys