Merge pull request #2 from arcnexus/TheFoxDev

The fox dev
Merge branch 'master' into TheFoxDev