solve 2282_Problem_B
Merge branch 'feature-2282'