Merge branch 'master' into dev-ma
Some style fixes
Merge pull request #12 from mikhail-aksenov/dev-ma

Dev ma