Updated for v0.9b