Added support for double