Updated code to pick up google plus users
Minor code changes