Fix feed errors
Merge pull request #85 from krazemon/feedflow

Fix feed errors