Merge branch 'master' into Beta
Merge pull request #1 from Whoami0117/Beta

Merge branch 'master' into Beta