task#6003
Merge pull request #43 from cuongnv540/task#6003

task#6003