fix a bug
Merge branch 'Atlas_4' into Master_2