Merge pull request #758 from jaimeMF/atom-feed