Implement proper sub code
Bump version to 0.0.2