Added support for strict mode