made sure that we are always displaying two decimal places
Merge remote-tracking branch 'origin/master'