Modified to work with os3 environment
Merge pull request #1 from dmitriy-serdyuk/os3fix

Modified to work with os3 environment