fixed typo
Merge branch '01-cleanup' into 08-fix-nmcnt-bugs