message calculator
Fixed message calculator
Merging issue-97 into develop and resolved conflicts