Update to v.0.2.1