Fix bug #140
Merge pull request #231 from Haprog/bug-140

Fix bug #140