API doc on class N
Merge branch 'develop'