Change the logic
Merge pull request #8 from nhattan/change_logic

Change the logic