edit code as comment
edit as comment
Merge pull request #2 from nguyen-an-mulodo/Dev

Merge after fixing code review