Part 1 of fixes for Chrome Extension
Merge branch 'master' of https://github.com/stayradiated/Nitro