Fixed #25 - Friends List