Merge pull request #334 from legendtang/fix