commit
Merge https://www.github.com/ajaycu90634/b-13calc
mmm
fixed conflict