Merge pull request #22 from phuonghuynh/master

Pls get the latest code