Updated for v0.3 release