Handle long feed names

Task 3297
Merge pull request #58 from N-Pex/master

Handle long feed names
Merge branch 'master' into paik
Merge pull request #59 from N-Pex/paik

Latest from master