by Jinqn video
Merge pull request #91 from Jinqn/dev-1.3.6

Dev1.3.6