Upgraded to version 0.2