Code portability improved
Merge pull request #12 from rdolgushin/master

Code portability improved