Updated to v.0.0.2