Merge pull request #1 from mck1117/develop

Develop
Fixed critical this-that
Merge pull request #2 from mck1117/hotfix

Fixed critical this-that
Merge pull request #3 from mck1117/master

Update dev to master