modify display
Merge branch 'master' of https://github.com/shilinf/381_6