updated 0.i.2 version from master