Bug fix #25
Merge pull request #30 from glorilla/PR25

Bug fix #25