Added support for negative numbers