Fixing options keys.
Merge branch 'hotfix/image-security'
Merge branch 'master' of https://github.com/meenie/munee