Merge pull request #33 from nurupo/master

Added conversion from friend_id to client_id
Fixed 2 small mistakes present in the last pull request.