[617] Update code
Merge pull request #10 from kelvintran19/617

[617] Update code