Completed recommender issue #40 :guitar: