Upgraded to 0.2.2 version