Merge pull request #10 from thaodtp/master

5135