Merge pull request #323 from cloudchou/master