Bump to 0.0.2
Some refactoring