Updated to v3.0.6