Merge pull request #32 from tungframgia/task8269

Task8269