Updated to v1.5.4