General fixes
Merge pull request #11 from feedlabs/issue-11

Feedify fixes