minus = 0
Merge remote-tracking branch 'origin/bomi1012' into wase1013