Upgraded to v 0.0.2