Improve robustness
Bump to 0.0.8