added row class
Merge origin/master