Fixed dealing with empty strings
Merge branch 'master' of https://github.com/kingaM/SocialNetwork