bug fixed nos scripts
Merge origin/master