succesfully merging Quang's PR

Merging Quang's Pull request