Merge pull request #123 from yying/master