Develop

Pls merge my latest test code with your develop branch. Thx.