Merge pull request #22 from phuonghuynh/master

Pls get the latest code
Merge pull request #36 from johnsonpham/master

Merge pull request #22 from phuonghuynh/master