Merge pull request #12 from ParadiseSS13/master

Merge From Master
Vox and Space
Merge pull request #54 from Fox-McCloud/Vox-Tweaks

Vox tweaks