Updated for v0.1.2-1-g4b61beb