[620] Update code
Merge pull request #11 from kelvintran19/620

[620]