Upgrade to 0.0.2 version
Code last refactor