added option to disable rating
merge conflict resolved