Upgraded to version 0.0.2