fixed feeds  -by jarrick
Merge remote-tracking branch 'origin/master'