Resolve TODO
Bump version to 0.0.2