Class C: some API doc
Class N: Some API doc
Merge branch 'develop'