Allow dx format
Display NMR
Merge pull request #1 from NPellet/master

update from npellet