Updated to v.0.3.0