Fix Bug #80
Merge pull request #88 from pragm/development

Fix Bug #80