Enhance robustness
Bump v0.2.1