Merge pull request #19 from longpham91/Long

update
Merge pull request #23 from longpham91/Luke

Merge pull request #19 from longpham91/Long