v0.0.2 final update