Cleanup quick'n'dirty copy-paste and use valid idl2c references.
Merge pull request #16 from Mind4SE/nmf-style

Re-sync
Merge pull request #21 from StephaneSeyvoz/nmf-style

Re-sync