Merge branch 'class'