Merge pull request #1 from framgia/os1210

Update 1210
Update
Merge pull request #4 from bs90/develop

Develop