Refactor
Bump to 0.0.3