Merge pull request #134 from yshui/fix