Added online friends detection support
merge