Merge with Socialmedia Parser version