Added all the extra stuff I've already done
Merge branch 'master' of https://github.com/evolve-os/browser