Merge conflict resolved
Merge pull request #214 from vmoyseenko/Sitrus2015

Merge conflict resolution. Sitrus2015 branch