Merge pull request #213 from vmoyseenko/Sitrus2

Merge conflict fix