fixed typo
Merge branch '01-cleanup' into 07-use-nmcnt-macros