Upgraded to 0.2 version