Some API doc
Ne alias into Class C
Merge branch 'develop'