Upgraded to v0.0.2