Master

Fixed feeds and unit tests