Updated for v0.2.0
Updated for v0.2.0