added support for decimals