Polished for v0.0.5
Polished for v0.0.5