[615] Update code
Merge pull request #12 from kelvintran19/615

[615] Update code