Podkovyrin's personal settings
Merge branch 'podkovyrin'