Merge: nitdoc: full rewrite