Merge pull request #1 from nash-ye/develop

Nmwdhj 1.3
Merge pull request #2 from nash-ye/develop

Nmwdhj 1.3.1
Nmwdhj 1.3.2
Merge origin/master into develop