merge commits from https://github.com/aNNiMON/Lightning-Browser