Merge pull request #226 from huangnoah/fix-70

Fix 70
minor-fix
Merge pull request #227 from RaymondChao/minor-fix

Minor fix
fix case