Updated to v.2.0.0