Updated code, new version is 0.02