Merge conflicts resolution
Merge pull request #236 from vmoyseenko/Sitrus2

Merge conflicts resolution