solve 1248_The_Balance
Merge branch 'feature-1248'