fix bug
fix bug again
merge
Merge branch 'computing_center'