Updated to version 6.0.0