Updated for v0.1.2-2