Updated up to v0.3.0