Added/Fixed NM and RM stop scripts
Merge remote branch 'origin/master'