Fix A Bug #80
Merge pull request #91 from pragm/development

Fix A Bug #80