Merge pull request #10 from One-Platform/master

update master