Fix case #37
Merge pull request #45 from cPJerry/v.0.04-dev

Fix case #37