Merge pull request #17 from thaodtp/master

aa
Merge pull request #25 from a05169/master

fix