Merge pull request #252 from huangnoah/fix-70

Fix 70
Merge pull request #254 from huangnoah/fix-70

fix case
Merge pull request #259 from huangnoah/fix-70

Fix 70
fix case