Changed settings
Merge branch 'master' of github.com:GrSpirit/test_c