updated for v0.0.2