chaning name of fields in nm_entry to support old compilers
Merge branch 'code' of https://github.com/kyzhai/SMURF into code