Some API doc into Class C
Merge branch 'develop'