updated for v0.2.1