Merge pull request #1 from vfa-huynq/develop

Develop
Merge pull request #3 from vfa-huynq/master

Merge pull request #1 from vfa-huynq/develop