Started working on a test
Merge branch 'master' into nextfeed-5
nextfeed-5: refactored, added tests and fixed the bug.