Added kw-np command arguments.
Merge remote-tracking branch 'github/features/kw-np-arguments' into personal