Updated for v0.2.2