Merge pull request #60 from maksimov/develop

Code formatting