added new cls
Merge origin/master