Syncing with VM install
Merge branch 'master' of https://github.com/audaciouscode/Roxy-Proxy