Added support for doubles