refactor NValue
change nvalue
Merge branch 'feature-nval' into develop