Added support for minus values