Version 0.9: some improvment