Rewrited settings
Merge branch 'master' of https://github.com/dax105/blocks.git