Merge pull request #1 from vfa-huynq/develop