fix ssh and merge hashes in parse_response_from method
merge upstream/master and fix conflicts
Merge pull request #9 from supremebeing7/ssh_and_hash_merges

ssh and hash merges