merge from rss_reader branch.