correction from yi2 to y2i in double fiber
Merge branch 'dev-class'