Merge pull request #72 from bazelbuild/friends

Friends support