Add fixes
Bump to 0.0.2