Merge pull request #1 from flebel/master

Pull commits from upstream
Added missing prefix to the name of a settings key.