More RSS changes
Merging with Ildoo's changes
Merging with Ildoo's changes