Added support for scalars with units, modified example file.