Added support for calculating with decimal places