NMR-Verbesserungen
Merge branch 'origin/master'