succesfully merging Quang's PR
Merge pull request #7 from herious1989/quang-pr

succesfully merging Quang's PR