Add $strict argument + doc comments