fixed the bug of unit changed in the bundle, and display unit changed for different levels.
Merge remote-tracking branch 'origin/master'