V0.0.7[*] & V1.1.3[+]

+refine the code