Fix bug #80
Merge pull request #87 from pragm/development

Fix bug #80