Merge pull request #22 from dkorolev/master

Shorter formatting.