Fixed #62 by merging 'favorites' branch.