Bug fix #26
Merge pull request #34 from glorilla/PR26

Bug fix #26