sixinli Merge pull request #341 from Rouche/master