Updated to v.0.5.8