solve 1346_Miscalculation
Merge branch 'feature-1346'