Merge pull request #53 from tunghdt91/develop

Merge pull request #52 from tunghdt91/develop
Merge pull request #54 from tunghdt91/develop

Merge pull request #53 from tunghdt91/develop