Merge pull request #36 from blueplanet/topic_fav

topic_fav