Merge pull request #10 from One-Platform/master

update master
Merge pull request #30 from shmilbin1570/master

Merge pull request #10 from One-Platform/master