Merge pull request #32 from wenjun1055/master