Merge pull request #1028 from quangnh89/master