merge
Merge branch 'master' of https://github.com/ludwiksh/Marksimos
update config