Merge pull request #52 from tunghdt91/develop

Merge pull request #51 from tunghdt91/develop