added this to class
fixed error
Merge branch 'class'