Updated to Normalize v3.0.1