Merge pull request #364 from DatongLi/master