updated ratings class
updated comments
Merge origin/master