V3.1 (Bug fixes & security improve)