Added support for '.'