Merge pull request #116 from imShara/fix_feeds