Merge pull request #333 from legendtang/master