Merge pull request #1 from vinhnx/master

Merge repo