Further development for 0.9 release