Merge pull request #4 from ZooTypers/master

pull
intermediate addition of friends
Merge pull request #183 from littlpunk/master

intermediate addition of friends