Fix case #36
Fix case #38

Change 20 to 100, which seems acceptable
Merge pull request #44 from cPJerry/v.0.04-dev

Fix case #36